added strings and removed unused classes