[Front-end] Removed excess code