Reverting some changes done, and removing some unneded stuff