Removed useless framework classes