Cleanup of code base