reverted a few classes commited by Xephi