Removed some unncessery lines