More Unneccessary stuff remove