[PATCH] apm: clean up module initalization