Frontend cleanup

Part 1