removed light switch functionality
more clean up