Added AAC support, removed useless JS objects