Removed unecessary and old commented code