Reverted unnecessary changes