Removed excess fronted stuff