[major] big cleanup, just use very basic foundation