Clean up code

remove unnecessary/unused codes