Removing unnecessary overengineering