Remove extra stuff, testing it out