cleanup

removed unused stuf
moved other stuf