Removed the unneeded ServiceLayer classes from Framework