Jtheobald/remove comments