full functionality cleanup:20131213