Cleanup

This cleanup made the page unstable
WIP