Clean up and todo stuff