Cleanup annoying codes