Code cleanup, removed unused and buggy activities