Removed some unused/old stuff