Cleanup

Shitty old code, better to reqrite than refactor