Added Expect method
Removed useless files