Removed all unneeded stuff