some cleanup, currently deactivating modules since they dont compile..