Cleaned up Client project