Removed unused code/variables