minor changes
remove unneeded code round 1