Removed some unuserfull code