Removed some more code to simplify new code addition,but thats for later

Signed-off-by: Exikle <dixondcunha@hotmail.com>