fix abnoxious namespacing, remove framework specific stuff