Few more tweaks
Cleaned what we don't need, fixed some warnings, thanks to Anarkia.