!!! CLEANUP !!!

(-) removed all unused stuff