removed unnecceary parts after merge