Remove unused stuff
Deleted used form and cleaned code