Forgot to get rid of unecessary stuff