cleanup, porting to 2560