got rid of unnecessary schema tables