Removed some dubble code