Marked code; Removed unused stuff