Remove preview/ folder; Clean commented out code