Removed unused code/final commit