console cake cleanup and unification
remove duplicate define