[#26] Removed unused/premature classes, added imports such that project compiles.