Reomved unecessary stuff