Remove dependency on CupCake.dll, fixes #21