Removed reduntant stuff