Fixes

some fixes before clean
Clean

Delete some un necessary Functions and remarks