Removed rectangle dependency