Removing useless table and entity