Cleanup, remove warnings and what not