Project cleanup(unused code), fix in allocator.