Clean up stuff
(cherry picked from commit af5fbcb)