Cleanup

Remove uneeded stuff