Removed solution stuff