removed all unneeded stuff