Removed undeveloped items for release
Removed a framework class to prep for release