more code cleanup - no more compiler warnings anymore