Fixes & Cleaning Up useless files