Removing extra stuff from front-end