Removed layer stuff for major refactoring.