Removed lscape, cleaned up