Clean up prototype Javascript (ongoing)