Cleaned out the code. No more parallel implementation for now