Finished stripping code down