App cleanup

Preparation for total bluetooth integration