Removed extra code that could cause a bug in the future