Trim back to basics for first release