Removed unneeded stuff and fixed some imports