Removed useless code and shtuff