Initial cleanup of gem creation