Cleanup, add profile template base