Removed useless Dummy classes