Clean up source

Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>