Cleaned up useless assumptions about the design.