Shefki:
	- Remove some changes I didn't mean to commit.
