Trimming Shape class down