Remove unneeded code
code style