remove code generation, this is package specific, + cleanups

Change-Id: Ie397dc69352a6b913b57635e252f9c51e99b89c4