Code clean up, removing unwanted stuffs