Removed all unneccessary changes