removal syncing is almost complete. cleaning up the code