code cleanup - release build not working !