Cleaned up placeholder classes