Corrected some unecessary front-end code