Clean

Removed unnecessary parts