Large code review
Unremove things