Better handling
Removed unused things