Edited few files and deleted some useless stuff