Removed somethings because they weren't needed