Removed all the unneeded stuff