Some codebase clean up