Removed other things not needed