Removed unused code; placed some last comments;