src cleanup and waitbrick formula update