cleanup from unnecessary codes
code cleanups