Removed unused import, commented warning that doesn't need to be there
Small cleanups, removed unneeded stuff