Removed unused pieces of code