Fixed warnings, removed large commented out code methods