Cleaned some unused code